From e1edc998a2e9c557030d207533932b3120e13fe5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 1 Mar 2013 18:25:12 -0500 Subject: [PATCH] Rename property to be more neutral Don't put toolbar in the name of the property - we may use a different container down the road, and then this name would be misleading. --- gtk/gtkentry.c | 38 ++++++++++++++++++++------------------ gtk/gtktextview.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 1221c05d61..159120473c 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -223,7 +223,7 @@ struct _GtkEntryPrivate guint truncate_multiline : 1; guint cursor_handle_dragged : 1; guint selection_handle_dragged : 1; - guint populate_toolbar : 1; + guint populate_all : 1; }; struct _EntryIconInfo @@ -321,7 +321,7 @@ enum { PROP_INPUT_PURPOSE, PROP_INPUT_HINTS, PROP_ATTRIBUTES, - PROP_POPULATE_TOOLBAR + PROP_POPULATE_ALL }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -1425,18 +1425,17 @@ gtk_entry_class_init (GtkEntryClass *class) PANGO_TYPE_ATTR_LIST, GTK_PARAM_READWRITE)); - /** GtkEntry:populate-toolbar: + /** GtkEntry:populate-all: * - * If ::populate-toolbar is %TRUE, the #GtkEntry::populate-popup - * signal is also emitted for touch popups. In this case, the container - * is a #GtkToolbar. + * If ::populate-all is %TRUE, the #GtkEntry::populate-popup + * signal is also emitted for touch popups. * * Since: 3.8 */ g_object_class_install_property (gobject_class, - PROP_POPULATE_TOOLBAR, - g_param_spec_boolean ("populate-toolbar", - P_("Populate toolbar"), + PROP_POPULATE_ALL, + g_param_spec_boolean ("populate-all", + P_("Populate all"), P_("Whether to emit ::populate-popup for touch popups"), FALSE, GTK_PARAM_READWRITE)); @@ -1499,17 +1498,20 @@ gtk_entry_class_init (GtkEntryClass *class) /** * GtkEntry::populate-popup: * @entry: The entry on which the signal is emitted - * @popup: the menu or toolbar that is being populated + * @popup: the container that is being populated * * The ::populate-popup signal gets emitted before showing the * context menu of the entry. * * If you need to add items to the context menu, connect - * to this signal and append your items to the @widget. + * to this signal and append your items to the @widget, which + * will be a #GtkMenu in this case. * - * If #GtkEntry::populate-toolbar is %TRUE, this signal will + * If #GtkEntry::populate-all is %TRUE, this signal will * also be emitted to populate touch popups. In this case, - * @widget will be a toolbar instead of a menu. + * @widget will be a different container, e.g. a #GtkToolbar. + * The signal handler should not make assumptions about the + * type of @widget. */ signals[POPULATE_POPUP] = g_signal_new (I_("populate-popup"), @@ -2261,8 +2263,8 @@ gtk_entry_set_property (GObject *object, gtk_entry_set_attributes (entry, g_value_get_boxed (value)); break; - case PROP_POPULATE_TOOLBAR: - entry->priv->populate_toolbar = g_value_get_boolean (value); + case PROP_POPULATE_ALL: + entry->priv->populate_all = g_value_get_boolean (value); break; case PROP_SCROLL_OFFSET: @@ -2501,8 +2503,8 @@ gtk_entry_get_property (GObject *object, g_value_set_boxed (value, priv->attrs); break; - case PROP_POPULATE_TOOLBAR: - g_value_set_boolean (value, priv->populate_toolbar); + case PROP_POPULATE_ALL: + g_value_set_boolean (value, priv->populate_all); break; default: @@ -9356,7 +9358,7 @@ bubble_targets_received (GtkClipboard *clipboard, append_bubble_action (entry, toolbar, GTK_STOCK_PASTE, "paste-clipboard", priv->editable && has_clipboard); - if (priv->populate_toolbar) + if (priv->populate_all) g_signal_emit (entry, signals[POPULATE_POPUP], 0, toolbar); gtk_widget_get_allocation (GTK_WIDGET (entry), &allocation); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 83433f7dfd..1a0b56069f 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -239,7 +239,7 @@ struct _GtkTextViewPrivate guint vscroll_policy : 1; guint cursor_handle_dragged : 1; guint selection_handle_dragged : 1; - guint populate_toolbar : 1; + guint populate_all : 1; }; struct _GtkTextPendingScroll @@ -295,7 +295,7 @@ enum PROP_VSCROLL_POLICY, PROP_INPUT_PURPOSE, PROP_INPUT_HINTS, - PROP_POPULATE_TOOLBAR + PROP_POPULATE_ALL }; static void gtk_text_view_finalize (GObject *object); @@ -863,18 +863,17 @@ gtk_text_view_class_init (GtkTextViewClass *klass) GTK_INPUT_HINT_NONE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** GtkTextView:populate-toolbar: + /** GtkTextView:populate-all: * - * If ::populate-toolbar is %TRUE, the #GtkTextView::populate-popup - * signal is also emitted for touch popups. In this case, the - * container is a #GtkToolbar. + * If ::populate-all is %TRUE, the #GtkTextView::populate-popup + * signal is also emitted for touch popups. * * Since: 3.8 */ g_object_class_install_property (gobject_class, - PROP_POPULATE_TOOLBAR, - g_param_spec_boolean ("populate-toolbar", - P_("Populate toolbar"), + PROP_POPULATE_ALL, + g_param_spec_boolean ("populate-all", + P_("Populate all"), P_("Whether to emit ::populate-popup for touch popups"), FALSE, GTK_PARAM_READWRITE)); @@ -1142,17 +1141,22 @@ gtk_text_view_class_init (GtkTextViewClass *klass) /** * GtkTextView::populate-popup: * @text_view: The text view on which the signal is emitted - * @popup: the menu or toolbar that is being populated + * @popup: the container that is being populated * - * The ::populate-popup signal gets emitted before showing the + * The ::populate-popup signal gets emitted before showing the * context menu of the text view. * * If you need to add items to the context menu, connect - * to this signal and append your items to the @popup. + * to this signal and append your items to the @popup, which + * will be a #GtkMenu in this case. * * If #GtkEntry::populate-toolbar is %TRUE, this signal will * also be emitted to populate touch popups. In this case, - * @popup will be a toolbar instead of a menu. + * @popup will be a different container, e.g. a #GtkToolbar. + * + * The signal handler should not make assumptions about the + * type of @widget, but check whether @popup is a #GtkMenu + * or #GtkToolbar or another kind of container. */ signals[POPULATE_POPUP] = g_signal_new (I_("populate-popup"), @@ -3287,8 +3291,8 @@ gtk_text_view_set_property (GObject *object, gtk_text_view_set_input_hints (text_view, g_value_get_flags (value)); break; - case PROP_POPULATE_TOOLBAR: - text_view->priv->populate_toolbar = g_value_get_boolean (value); + case PROP_POPULATE_ALL: + text_view->priv->populate_all = g_value_get_boolean (value); break; default: @@ -3395,8 +3399,8 @@ gtk_text_view_get_property (GObject *object, g_value_set_flags (value, gtk_text_view_get_input_hints (text_view)); break; - case PROP_POPULATE_TOOLBAR: - g_value_set_boolean (value, priv->populate_toolbar); + case PROP_POPULATE_ALL: + g_value_set_boolean (value, priv->populate_all); break; default: @@ -8867,7 +8871,7 @@ bubble_targets_received (GtkClipboard *clipboard, append_bubble_action (text_view, toolbar, GTK_STOCK_PASTE, "paste-clipboard", can_insert && has_clipboard); - if (priv->populate_toolbar) + if (priv->populate_all) g_signal_emit (text_view, signals[POPULATE_POPUP], 0, toolbar); gtk_text_view_get_selection_rect (text_view, &rect); -- 2.30.2